From ba2f479aa066114d33f8c7c3a2f3c28085b7d8ff Mon Sep 17 00:00:00 2001 From: Cosimo Cecchi Date: Wed, 3 Jun 2015 18:14:06 -0700 Subject: [PATCH] iconview: don't call gtk_style_context_set_background() --- gtk/gtkiconview.c | 43 ------------------------------------------- 1 file changed, 43 deletions(-) diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c index 96e6d0dcef..f81b9096cd 100644 --- a/gtk/gtkiconview.c +++ b/gtk/gtkiconview.c @@ -130,9 +130,6 @@ static void gtk_icon_view_get_property (GObject static void gtk_icon_view_destroy (GtkWidget *widget); static void gtk_icon_view_realize (GtkWidget *widget); static void gtk_icon_view_unrealize (GtkWidget *widget); -static void gtk_icon_view_style_updated (GtkWidget *widget); -static void gtk_icon_view_state_flags_changed (GtkWidget *widget, - GtkStateFlags previous_state); static GtkSizeRequestMode gtk_icon_view_get_request_mode (GtkWidget *widget); static void gtk_icon_view_get_preferred_width (GtkWidget *widget, gint *minimum, @@ -350,7 +347,6 @@ gtk_icon_view_class_init (GtkIconViewClass *klass) widget_class->destroy = gtk_icon_view_destroy; widget_class->realize = gtk_icon_view_realize; widget_class->unrealize = gtk_icon_view_unrealize; - widget_class->style_updated = gtk_icon_view_style_updated; widget_class->get_request_mode = gtk_icon_view_get_request_mode; widget_class->get_preferred_width = gtk_icon_view_get_preferred_width; widget_class->get_preferred_height = gtk_icon_view_get_preferred_height; @@ -372,7 +368,6 @@ gtk_icon_view_class_init (GtkIconViewClass *klass) widget_class->drag_motion = gtk_icon_view_drag_motion; widget_class->drag_drop = gtk_icon_view_drag_drop; widget_class->drag_data_received = gtk_icon_view_drag_data_received; - widget_class->state_flags_changed = gtk_icon_view_state_flags_changed; container_class->remove = gtk_icon_view_remove; container_class->forall = gtk_icon_view_forall; @@ -1276,7 +1271,6 @@ gtk_icon_view_realize (GtkWidget *widget) GdkWindow *window; GdkWindowAttr attributes; gint attributes_mask; - GtkStyleContext *context; gtk_widget_set_realized (widget, TRUE); @@ -1320,11 +1314,6 @@ gtk_icon_view_realize (GtkWidget *widget) icon_view->priv->bin_window = gdk_window_new (window, &attributes, attributes_mask); gtk_widget_register_window (widget, icon_view->priv->bin_window); - - context = gtk_widget_get_style_context (widget); - gtk_style_context_set_background (context, icon_view->priv->bin_window); - gtk_style_context_set_background (context, window); - gdk_window_show (icon_view->priv->bin_window); } @@ -1342,38 +1331,6 @@ gtk_icon_view_unrealize (GtkWidget *widget) GTK_WIDGET_CLASS (gtk_icon_view_parent_class)->unrealize (widget); } -static void -_gtk_icon_view_update_background (GtkIconView *icon_view) -{ - GtkWidget *widget = GTK_WIDGET (icon_view); - - if (gtk_widget_get_realized (widget)) - { - GtkStyleContext *context; - - context = gtk_widget_get_style_context (widget); - gtk_style_context_set_background (context, gtk_widget_get_window (widget)); - gtk_style_context_set_background (context, icon_view->priv->bin_window); - } -} - -static void -gtk_icon_view_state_flags_changed (GtkWidget *widget, - GtkStateFlags previous_state) -{ - _gtk_icon_view_update_background (GTK_ICON_VIEW (widget)); - gtk_widget_queue_draw (widget); -} - -static void -gtk_icon_view_style_updated (GtkWidget *widget) -{ - GTK_WIDGET_CLASS (gtk_icon_view_parent_class)->style_updated (widget); - - _gtk_icon_view_update_background (GTK_ICON_VIEW (widget)); - gtk_widget_queue_resize (widget); -} - static gint gtk_icon_view_get_n_items (GtkIconView *icon_view) { -- 2.30.2